Merge "DOWNSTREAM: Merge commit '40859329b5fbe8ae101e7abfcd5472dd4908f290' into camx-topic" into dev/msm-4.9-camx