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

Change-Id: I6576291dfe7c28df939eaf6ad381fd1a015cd818