Merge "Upstream partner request to add BC methods to core platform API."
am: 522b484121

Change-Id: I2c26e8097bed117bac7e8b9ff73a2af0fcd74bc0