This change depends on r.android.com/314437 Bug: 33666900 Test: None Change-Id: Ibcf177186e64e7e34493301f109ea9d4454fa3a2
Test: Uploaded Change-Id: I454df2797ac7314060646c66c6caf2538d36b1d0