DO NOT MERGE Security fix

 Bug: 4742007

Change-Id: I187ce151078795ad9b566e9dfbfe69c38d15b478
1 file changed