Merge "Modify Open Mobile API to follow Android API guidelines"