(cherry picked from commit a3b9d4ed) Bug: 21872507 Change-Id: I20f9920e4a12511ce498c252bca955d82a4f4102