(cherry picked from commit 2672a9f9) Bug: 10645725 Change-Id: I55c2a7b7f3bd105f1a6a8bf84db2204c6f87e642