Merge changes from topic 'PBAP-1.2' am: 2d2af9a9e6
am: 0428d6217b

Change-Id: Iab29151c611149b054d86bce85c8e4d4f6b8fe86