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

Change-Id: I3a7a241660c3016c6215e56f0da9a94aff222b2a