Merge commit '5fa2972939fbeb5b3691db2762a7c7eb1ecce74c' into nougat-mr1-cts-dev

BUG: 33090058
Change-Id: Ib1c023c4c6c624d5d66809c7ec88d99f3721b662