Merge tag 'r4275.1_FP2_gms59_1.5.1' into fp2-sibon-staging-16.07.00rc2

Change-Id: Ifbab5605135d5156c983b6d6f997a4e770cd5bef