Merge changes from topic "pes" am: 04587692b1
am: 22408e85af

Change-Id: I8a51103e8e789fe5a2b0401238a1ef1812c4da29