Compilation fix: N-MR1 merge

Change-Id: I0d5d13dd127c8d44b593c743ece5d918fc9e0181
1 file changed