Bug: 186246362 Test: Verify from logs that we don't finish the controller multiple times Change-Id: I8d40a756216133b8a278a28b822cf75c6e2a3046
Bug: 181165935 Bug: 179065491 Test: Verified on device Change-Id: Ifa6a91560cb31b4dfb72a0f582607e873d8a002d