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

Change-Id: I2debb7e2402a48a291cc20a9714370b17bcf9392