Merge changes from topic "current-on-aosp"
am: 0d30daba94

Change-Id: I714cce4d2cfb92e7bf0500eb271a222722f1671a