Merge changes I57c34813,I96b56fde into pi-dev am: bfe781e4bd
am: 481cfd439d

Change-Id: If895a7be0c3f81a0b00027d6640ef776f8b0dd0d