Merge "Fixed error concealment when no MBs are decoded in the current pic am: b926905ee2 am: ff54ee6115 am: 9fca73a55e am: 19080458ba am: 9836aa04a9 am: b424a5e101" into nyc-mr1-dev-plus-aosp