Compilation fix: N-MR1 merge

Change-Id: I24b0b4e9ed19552411b9042dd23ca244a7379377
1 file changed