Bug: 15840116 Change-Id: Id72b739e73cb3e72f56e1872ad9d60469555e193
bug: 6911140 Change-Id: Id689be1fb9dbc89b5a9b7f142626751a62d931ed