(cherry picked from commit d8bef737) Bug: 17375269 Change-Id: I8a810b4f21eb5a94883415cf7ecc4df273d72688