Bug: 17499772 (cherry picked from commit 1d6ee090) Change-Id: Id09809c476c685f0a197ee75bb08638931364efd