Bug: http://b/21858067 Change-Id: Iaa83a5e17cfff796aed4f641d0d14427614d9399 (cherry picked from commit b1304935b6)
b1304935b6