Merge "Remove TODO for b/112462307" am: 1914bd0f4b
am: a681afc358

Change-Id: I4975cdfdf909ca64d027400678bda0ec9153db39