[automerger skipped] Merge changes from topic "PPRL.181205.001" am: 8d32a659a5  -s ours
am: 721dd95d5b  -s ours

Change-Id: Ieb7134dd2c33659ef3e57c3d0968aced4d79ce37