Snap for 4402249 from 0ad0417fac6a35b97778b49091dfb7dc91708a77 to oc-mr1-release

Change-Id: I43846083967f93ed8dcd3988c90963e48a6191b5