Merge changes from topic "recovery_dtbo" am: 3ac694632c am: c9dffd158c
am: 7cc1d44b94

Change-Id: Ie04e87d3d0d2d6f1b0531652fc9438eb0e7e865b