Merge changes I73699636,Ibe2aab97 into pi-dev am: f022576bc4 am: bbdc2e24b7 am: 560ce07c63

Change-Id: I371e0555733fefcdaf13cebc056b8a976213e3f1