Change-Id: I993f3f4d4c729fb7d4e914ed427ad16938067af5 BUG: 129345239
mentioned in commit 7527bd88
mentioned in commit 86cb16b3