Merge "add dtbo support for ota" am: 294d5c5f07 am: 793a9bb490 am: d2f336664c
am: 3a3d9c5837

Change-Id: Id22f24fda9c61fd77d9c27784a424b8afdfd7398