Merge changes from topic "recovery_dtbo"
am: 3ac694632c

Change-Id: I684c39d4381f93e5ae3df7af21a6a60c2899b15d