Change-Id: Ia21cc7bfc97e7347f4dfa5d9d25d87c4be70be9d
Change-Id: Id37c0bfc1fe7e2c7156aab0ec85df123534c8c96 Bug-id: 11252971 11256762 11256765 11257156 11257769 11276296 11293924 11324992 (cherry picked from commit 0b734038a6ff6c19785ae3979c3085910b9208a0)