Bug: 17463118 (cherry picked from commit bfc2b98a) Change-Id: Iea04bb7f6c4daa9cbdb8ee6ce8ddcbeb9f05aa3d