Bug: 8580410 Change-Id: I2ca4fa00dde0b574df3619134836bcb9315bd506
Bug: 6615693 Change-Id: I64c3b3ce0bba62d9c332a795f7d979fb753dc27b
Change-Id: I8a5318022ce5cd3e7c8055f21fe5da74639aa6c0