Merge changes Ie6136b85,I3b98e030,I9f0e1a18,I13402736 into pi-dev am: db24fb3610

Change-Id: I163d85877f2c60de20ed65046c8f3bacbc879a43