Merge mobile forms api and api-bundle

https://trello.com/c/7bmp0gtj

Merge mobile forms api and api-bundle

Change-Id: I5a011b84f717eaffd8af5ab2209016de42a97c49