Newest files and changes

Change-Id: I45c33f11f59444e33d5cd53c175e9618f0ee85cf