bug: 6910993 Change-Id: Ie515acd625bc266494d9e63b0694e2c05a19b661
bug: 6911140 Change-Id: Id689be1fb9dbc89b5a9b7f142626751a62d931ed