Bug: 11156955 Bug: 15291317 (cherry picked from commit a167eef548) Change-Id: Ib038ad34ef59631f7b4ed6dff2b7956001b8b159
a167eef548
Change-Id: Ic591e22fa5b363bb68376b9f25814c0e5bd83fbf