Merge Android Pie into master
am: 3545ba6cce

Change-Id: Ia1db2c34840cdef6874f9000d8f44fed4f86e9eb