Some changes from master

Change-Id: I269f01cbba74075ed953a0140766408796188042