Merge changes from topic "userspace_adiantum_support" am: 7adca74263 am: 3d5c751a88
am: ad60a8609c

Change-Id: Ie7c67da59212bd45e446dc81c9109092d9bb6b9b