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

Change-Id: Id697f434d8b70c929e0390a48e360a5d10dc3e9e