Rebasing on master

Change-Id: Iad49f225f23675b843457df5d6965c7cd50e99a3