Bug: 189982238 Bug: 187561242 Bug: 187909098 Test: manual Change-Id: I693810e5761004c48d028253c25a2fe96477af40