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

Change-Id: Id1d309d05758193aedc8ce568179335db9882edf