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

Change-Id: I14c74464877d58f74abab8914ac85aae435b7938