Merge "It exposes a few bugs that should be address before submitting it. "
am: a4af47ebf5

Change-Id: Idd787aa38a58b11d3aae960e80c8bd6fc89a48ee