Bug: 63146105 Test: External script Change-Id: I1281779ccf38d1d2dfb1a6dc0e45c0e533cabbca Merged-In: I1281779ccf38d1d2dfb1a6dc0e45c0e533cabbca (cherry picked from commit 4982eb5d) (cherry picked from commit a654681c) (cherry picked from commit 64a12d3b6e71d9161837f28ce18c34d924c2bafc)