Merge "Merge commit '70be28c9d8067d077f5975c64216ee274e37510f' into Topic+AU174" into dev/msm-4.9-camx