Bug: N/A Test: N/A Change-Id: Ibf38b90f9facda8c134b073bb2b15a9cbe191e3f
mentioned in commit 51d24405
mentioned in commit 3654f032
mentioned in commit 0cc02265