Rebase changes

Change-Id: I35fe6b0e350127df2268de1fea8c9d0e074309d9