Bug: 27775991 Change-Id: I22864aa22d4864d85e055a5b1d3ff1faf122011b (cherry picked from commit b270b9e6)