Merge "[NS A11] Small refactor"
am: ed2a3ec9b4

Change-Id: I317e6b99a51ddb0a3e49b08c595eb42f4edad1e9