Bug: 18844550 Change-Id: I431a223d55430aa8e1bb28f0275e11876ed0e0bb (cherry picked from commit d1851e6e)