Merge "Update num_mbs_left When mb_x is Reset." into mnc-dev am: f7cc570a1d am: 6885bab2da am: 8ffb648d7a
am: eba2dd32e8

Change-Id: I8b48699b6187df94956da072fc3bd81bc8b8b4dd