Merge remote branch 'msm-3.4' into apq8064_ics_k34

Change-Id: I5763d2b567f0a798bf94803ce7d0aa2dc432ae94