Merge "Modify Open Mobile API to follow Android API guidelines" am: ee63876ed4 am: 2fa5be61cb
am: b126fbb86a

Change-Id: I6b8dd7ac2b5dec262d23a7f59c6af7c3f0ac744c