Merge changes I3d727530,Ia17bc5a0 am: a4d3a69c57

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1463005

Change-Id: I613429b2e1cbf7555f20eb8e555586ff8eb17911