Bug: 187145174 Test: manual & robotest Change-Id: Ifc06a38ff65f084db2803c56b5a37224c5b9b810
d42d9a41f6