Bug: 17166556 (cherry picked from commit b6cabc13) Change-Id: I9975ba07ad8f119a6e367e2770a60040a462149b