Merge from AOSP staging branch

Change-Id: I28f72f7c361eaa4a0fae671e988b52708cb9e3af