Merge fp2-sibon-17.08.1.1 into cm-14.1

Change-Id: I2a63b2f99cb73523c3d7adca7a84539877801912