Squashed update to master

Change-Id: I8091d97339a3b094568bc00d0069b9a2c3e2996d