Corrected merge problems

Change-Id: I333229d646e76c45622e00fe8cefcdefdea054be