[automerger skipped] Merge changes from topic "back111085900" into pi-dev am: 3eef28d461
am: ba268c60bf  -s ours

Change-Id: I38e04bfe9bf3b19c7947a685d3ebc81eca8796ad