Bug: 12449798 (cherry picked from commit 9990b3973b) Change-Id: Iba92e2aa262666a59fc38b870dfd9f4082eeb628
9990b3973b