Merge \"Don\'t allow restore sessions during backups\" into nyc-dev
am: 9faaf5418a

Change-Id: I68e844ee0710bc4125da7789c2059ab23262ba76