Bug: 33828433 (cherry picked from commit 2f157c421a) Change-Id: Icc03f0fcbf40d87e0b9c69e1172802ffcc85531b
2f157c421a