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

Change-Id: I3b03ea15a76db676c9f595bd585c1106d10460f8