Snap for 7188176 from d12e6490f1f308dccfff46a2d38092c483c75c6d to rvc-d2-release

Change-Id: I90bcb60a8038c9d1911757f0a2c88f28747f6893