Merge "Fix some bugs for robustness." into rvc-dev am: 4cbd3b7a8e

Change-Id: If530f4c6c67d869734b020a77e135c079173a2f9