Bug: 10415342 Change-Id: Id8caf5a972fe72b577dbf50dcd2cf739b2d35a32
Bug: 8976566 Change-Id: I00034994fe2c619e91362cbaddc722597a1ae22f