b/16632858 Change-Id: I611075c836fa8eeb24450aacfbef780af7bedcd2
Bug: 11174042 Change-Id: I4c7e6336ef0a354bf4dc2ecefd129110fb2f974f (cherry picked from commit faaec9f4e1c50d08c1050db3a2969452d536a13f)