am 3f051210: Merge from AOSP staging branch am: 7542010f7b

Original change: undetermined

Change-Id: I6171a6ae1d090b41091dd0c8938bca266dc2b732