Merge "Merge SP1A.201105.002 Change-Id: I067332a5143f80549a6413d3e7366b001e6cffc3" into s-keystone-qcom-dev