This is a follow up change of If6c0edef.

Bug: 5328922
Change-Id: Idb415f53f3fea6660c7802577d08b4d89d4e7842