Merge fp2-sibon-17.07.6 into cm-14.1

Change-Id: I1f82020728ac6317cc1a43302281553bc03b8b19