ca276c40df
Bug: 11156955 Bug: 15291317 (cherry picked from commit a167eef5482d4a89d4277ec74f57adbe38052813) Change-Id: Ib038ad34ef59631f7b4ed6dff2b7956001b8b159