Bug: 63146237 Test: External script Change-Id: I4e519cec1c7dffb8bd42add00bd891e0969a3d9f (cherry picked from commit 9ab89b7d)