Merge "towards MR2: update to new backend" into rvc-dev am: 19f6945f56 am: af019036ef am: 65605d626e am: 94fc85d385

Change-Id: I3cbdfc7e627e75efab1dd7c39d84e06c60cd1d9b