Revert "Merge remote-tracking branch 'aosp/upstream-pull-525' into master" am: 37043f9e86
am: 8e7552aae7

Change-Id: I2fcdfd5240ed833c7910b2e4810a9d24b2aa8772