Bug: 27621360 (cherry picked from commit ec3b7ab8) Change-Id: I617eee243f475872235fd75b6a401e056111ea23