Merge changes from topic "userspace_adiantum_support"
am: 7adca74263

Change-Id: I7bd33d9f750bc738c3df43ebf27e7f0d96d6fc5c