Merge changes from topic "planz" into pi-dev
am: 93e11759d6

Change-Id: I342eb26c7e50582c1ce34a7c8b70dadbb7881858