Updating components to master

Change-Id: I78a25f5f590fbcaed243b1398f7f3683dd5924bc