Merge commit 'fc575bca313624a7cba20171fbaa625bbc852cd4' into nougat-mr1-cts-dev

BUG: 33090058
Change-Id: I1caa61ea452dd419afe5acc15b3e230a7ad7664f