This commit resolves some compiling issues due to merge. Change-Id: I0eef8aa36c404e185e0b0004948a49307c360d3e