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

Change-Id: I3f33a599ce48fd9c8325ad6c2c973e273c8ff629