Merge changes Ibba49951,I106f1f33 into pi-dev
am: 0edb3ca033

Change-Id: I36e46e0d3f70e79ab609e9583b51b8484c460e38