Bug: 18035729 (cherry picked from commit 6f201ddc) Change-Id: I9865932ca87acefe0ab7feb3e6dc875f3d64276d