Corresponding to aosp changes:
https://android-review.googlesource.com/261231
https://android-review.googlesource.com/261194
https://android-review.googlesource.com/261211
Change-Id: I13caa90b7f97d5aa447050f89a5312d22db3d277
(cherry picked from commit 29835cc56e)