Merge changes I09f58bdc,Iaf6cee33 into pi-dev
am: b5438ce105

Change-Id: I0e90c930d11e7909d8a519b5714dd2ef3fa6e338