Linfeng Zhang authored Dec 05, 2017 and James Zern committed Dec 09, 2017

This is a preparation of following get_nz_map_ctx() refactoring.

Change-Id: I60d71863f39d8f271c44abee5855fd4d89b544b1