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

Change-Id: I67b8109939874babfb594071e3b268d0b7142e7b