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

Change-Id: I61602ba0fa444a68a874ef8700ab26fb919abd56