CleanSpec to clean up _bp am: 2dacff534e
am: e375e4bb9a

Change-Id: I3d9c46349fb016f5f9d88cb72b07524341cc6871