Response to review comments for: Address layout management is mislabeled
in the application - TRUNK-3847
(cherry picked from commit a7895e18dee3bce31937e0f4897b3f920d681879)