[automerger skipped] Merge "Add removed platform functions used by apps." am: 8106319006
am: e4a24f0fa2 -s ours
am skip reason: change_id Ib1ea3a37b3729f9bcc2739c5f3a584ea8f66d200 with SHA1 235f35a266 is in history

Change-Id: I9fbd8ec75b945468f64fa1d9da652777403c03fb