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

Change-Id: Icf13d4bdb36a34f7e1d9a488f8079b2e5e52a60e