Merge changes I5851dd16,Id196307f into pi-dev
am: 8d6571aeed

Change-Id: If389a3822b5bd51e4b714c1dde5cf17122d3ce8e