rebase. fixes compiling errors

Change-Id: I1c43c76f8c109973fb01d0897bf5100ec1acbd62