Bug: 27529815 (cherry picked from commit b61a0dae09) Change-Id: I401531a469f8ea01175d738e1cb4a02a064c9194
b61a0dae09