Bug: 29885295 Change-Id: If187a08574b86ab775b0a4594d21bc9e26f84e2f (cherry picked from commit beb21afc)