Bug: 30622771 Test: manual Change-Id: I5d786b13cf99287732e16769e2563ac7c4fe715c (cherry picked from commit 63fad69a)