Merge "DOWNSTREAM: Merge commit 'f526258c529fcdf0c6b9d3047df5beac2420aac6' into topic - AU247 10/17" into dev/msm-4.9-camx