Snap for 4391495 from 331d79d26b237a6ebf4284dd99c79b0fe5ab55df to oc-mr1-release

Change-Id: Ia1a538a97249d77b25b1f1568df514547c0bcd5f