Bug: 26962895 Change-Id: I42418eee320ddae857b42572690316c53f638e85 (cherry picked from commit 722072d6)