Bug: 134405016 Change-Id: Iabf0553a809c06a098a95648d1880eee6743d205
mentioned in commit e543b21a
mentioned in commit 08add9b2