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

Change-Id: Ib593282845cca1bbd3a2b36a2049914fc73cbbd1