Merge changes I90451c14,I9fb27a0a into pi-dev
am: b91dd1d944

Change-Id: I58459846d6cb79d616b4bd9c83450dc911e5115c