Fixing merge conflicts

Test: treehugger
Change-Id: I80438d19e9b8de648cc3129e9ace2337b56d1c24
1 file changed