resolved conflicts for merge of bb3ed7eb to jb-mr2-dev

Conflicts:
	src/devices/devices_toc.cs

Change-Id: Ia5de3e145941a4959880bbb1ca1faf7878b9d4a3