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

Change-Id: Ifd358733c264d31455ff8ad70cee25b8f02825f7