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

Change-Id: I2e9c99ebda56a6e178d2f68f3311853d7de57c7d