Merge "Add more test case and some clean up" am: a0e4349794
am: 2a93421b60

Change-Id: Iaf66ebc89188f0100bdc95fcc42574a4b1ad14fe