Merge Qualcomm release PPR1.180321.001

Change-Id: I798191d8f7844e5bdb280849c8442ad2dc973415