Merge "DOWNSTREAM: Merge commit '38ef2dbc9c0c1d930f2c274f6dbfc1587bdf0b6a' - AU331 onto topic - 01/12/18" into dev/msm-4.9-camx