Merge commit '50650f44fd1c18620bc39a4458f38974eef61402' into private_redfox64_mbr.

Conflicts:
	hal/msm8974/platform.c

Change-Id: Ie0bb8b8a122ead1e46476bb4eb7ec5e3e34108e0