Merge "Eliminate the APEX name in fs_config using wildcard" am: ea353cab91 am: 2e0f43c6ba
am: 76a125bf4e

Change-Id: I5ce055eb7b0c70a1059a9755a544e51d9fce0058