FP2: Merge 17.11.2 into cm-14.1

Change-Id: I27fc17baba9fe4a6c8d9d9813c5e5ceaaae59118