Merge "Revert accidental change introduced in 000e188570."
am: c65310326e

Change-Id: Ib46e20905171edbaf12e1ff08e1d1e9a23776860