Merge "Add container class to backup fields in leveldb" into tm-mainline-prod