Bug: 62187433 Test: yes Change-Id: I4f871e361a5989f70f467719fda2ebd38b450412 (cherry picked from commit 92e3d766)