Merge "fsconfig: Use defined macro for masking" am: 35eaf52ee2 am: d83bb4193a
am: ced2e48998

Change-Id: I9819032f3d0473cb307e96b96331cd753b871e69