Snap for 4564219 from 71ef361f3e54762ac8c7c773f917ca6f3647805b to nougat-mr1-cts-release

Change-Id: I20ca420cee5e9851527bb058c9f2158c02b7b311