Test: cts Bug: 173437870 Change-Id: I12d78f475b947cedb201ff1b379cc64a8f876e62 Merged-In: I12d78f475b947cedb201ff1b379cc64a8f876e62 (cherry picked from commit 13690010)