Merge "DOWNSTREAM: Merge commit '037d768fed48a450c2533affa8a3817cf2d7d9c9' into topic branch 09/20/17" into dev/msm-4.9-camx