Follow up on I79beee03e8773bb7b3e1dbdd881ddaf6fdb24827 Bug: 230449916 Change-Id: Icc7087c33784721f2f691096a4b71895615bcf43
based on pipit 68a0b4b411e8d23dfd966d24a5c35ea4ffb9d5f1 and cheetah 9acaa7507c23ffc7ca5f82a9579dd3a7c56af809 Bug: 206057564 Change-Id: Id59ed48d2a39c9a5a811c41157732914f3568d51