Test: N/A Change-Id: I75d8e04e964fb999a12043e835acde8f7dcf68be
mentioned in commit 090a58cb
mentioned in commit 28cf96a9
mentioned in commit edcafddc