[automerger skipped] Merge changes from topic "current-on-aosp" am: 0d30daba94 am: f4fda2e5e1
am: b1d7de2a14  -s ours

Change-Id: I9dbe4f7dd52d2254fb238781f062c812ca0a8045