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

Change-Id: I9a1bb39d81746ccd20b69b6c1beba6ffdecf96c6