Merge changes Ib48777df,Ie08aa85d into pi-dev
am: 2ce2f51797

Change-Id: Idf44f6a88bb8c867a7c40b19e222c89e76d1b199