Merge changes from topic "am-ca46f64a60174420a71e84f5c5d68368" into pi-dev am: 18119ec5b1

Change-Id: I75ac1d4fd808fd69e43c7bffb52c92ea254235f1