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

Change-Id: I48f46ab181f7a8fe8076d5fcf74a443cdd88df17