Merge from AOSP

Change-Id: I992d4a0baefc08e105f76b7e6f6950516047670a