Merge changes I2d09a84e,I111aab35 into pi-dev am: 4cfd9f242c
am: 3da0b8effc

Change-Id: I2c43c2eb35bb31964b3ace55b4ff51d0ee83029c