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

Change-Id: I29c43bcdccb3ba263c0a6a7e106c3c9180910c75