Merge "Modify Open Mobile API to follow Android API guidelines" into pi-dev
am: df369da85f

Change-Id: I1d94d93bcd80100d272632520a55affb996e93cf