Update for RB14.12 branch

Change-Id: I5dab4928b76fe3fbdf1e745dd3a0cb613dff2fc4
Signed-off-by: Mathew Martineau <mathewm@qce.qualcomm.com>