Merge changes Ib9ec5c8b,Ieb3abf14 am: ee865a72f6

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1475261

Change-Id: If93b054337417ef96b5cda7261fbab80c77e1b0b