Sync with bp branch

Change-Id: If3db30457ddff3b1799fc4fef38b9b6052875b3b