Bug: 27208635 (cherry picked from commit 2d4721c0) Change-Id: Ida926cabb706dfd962b692ba1775da332f68488f