Merge changes I0c466350,I09a9cd43,I8b2a0819 into pi-dev am: 4cda02f25f
am: 9dcc7b982b

Change-Id: Id79f409381fa6b211329ef85b13cd7f4202dccb0