Merge 'dd-staging-polaris' for MSM8998 LA 2.0.1 r00187.1.
am: 6852679a94

Change-Id: Ib8d5be05a3e3e7e70a7538b6d7348cc8d12061f1