am b5856a4e: am 0a3df652: Merge "Remove obsolete entry points."

* commit 'b5856a4ecd3ad70ad26082b2476c3dc6bb48dc87':
  Remove obsolete entry points.