Synched with latest changes to bp branch being upstreamed

Change-Id: I2c530387b85f0e78d649b72f1e9961d4ec675665