More updates to master

Change-Id: I1909f5db4dc1e22a2569afa110578b88f02edebf