bug:20332322 Change-Id: I645ad0d226869042c11225630e4de5968ebb7a0d (cherry picked from commit 176f512c5a)
176f512c5a