Merge "Fix 2 bugs that fail to update item listener right." into oc-dev am: 1b7738224f
am: 749b2df572

Change-Id: I1eb895079d1f453533382fcf542d55a87e14b4b6