Merge remote-tracking branch 'aosp/upstream-pull-525' into master am: 369c1a464f am: f3a4bd65a4 am: b55f07b186
am: b59ce01d2c

Change-Id: I3c476a20363a35f1f740c118cacd4b8e97266b5e