Merge fp2-m-sibon into cm-14.1

Change-Id: Ie203956074c36aa9e84ae2f5679c8123379dc317