Merge changes from topic "back111085900" into pi-dev
am: 3eef28d461

Change-Id: Iba9fbf2693f7adb1b9878bce213afeb2569403f4