Merge changes I1e21ab46,Ic4f298d7 into pi-dev am: 9e13cedd23

Change-Id: I1955ab27321c53498662acc35f0b36b58f3bbfd7