Bug: 26882072 (cherry picked from commit 2e960a07) Test: test/run-test --host --no-relocate 596-app-images Change-Id: I40a45e7944aec3a5ee28ef3d47e9881f61a7c9e6