Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I01825660a596428ba7ca66ea9c0c6139d245efa2
mentioned in commit 49ce960b