Merge changes Id4feeefa,Ie0a501b8 into pi-dev am: 45a250a2be
am: 6e66b320fd

Change-Id: I8f185099f0f00f62a9ae6e219f29c9dd2efd8d2d