Bug: http://b/27546414 Change-Id: Ia0b65540772ca4bd1cdab391973325b18cd278a0 (cherry picked from commit bf1082e9a1)
bf1082e9a1