Merge "Merge commit '0b564a62dc486a022b578cdb335b64c84b4bdf5d' - AU138 onto Topic branch" into dev/msm-4.9-camx