Merge "Fix some mgsi issues and add some basic functions" am: e9dfdaa239 am: c393e614e6
am: 3236f5b62d

Change-Id: I292e54aa31618883440df1f4d927e860432d9877