Merge changes I71708114,Ice92a8ea,Icc81b5f6 into pi-dev am: 74bbe171bb
am: 8e233cb5c6

Change-Id: I4b54697533c5c92f2a0bb3e8aada41746c4b637c