Merge "Add removed platform functions used by apps."
am: 8106319006

Change-Id: I624bb17ac4cf12678ea1d110f0a349b2f45714ad