Update Thanks to master tip

Change-Id: I73b2e0ea03b9f8ad755fb416082a091f8b5e32a7