Compilation fix: N-MR1 merge.

Change-Id: Idc98a5d1757068d2c69251d6c84bff61cb91b1f8
7 files changed