Bug: 9059539 Change-Id: I049941d2c83764c7f07c5215799b9657a7f27764
Bug: 6910787 Change-Id: Ib803a75ac3c0e36e05b82f36a38b3a7bc2cae689