Bug: 110985973 Test: all existing tests pass (including high level supportlib ones) Change-Id: I6b37ef419e3c76f35912f84500f88c069b7505ac (cherry picked from commit 664af785)