prima 3.2.3.172

Change-Id: Ic8e7d319f76430ad5b807eb2a5264d2c66c86359
Merge branch 'cm-10.2' into martincz