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

Change-Id: I06e50f8a0e7db6e8f44e66d8da11e693ee42f395