Update Gadgets to master

Change-Id: Ice764530b44707549eed27e094e01a506e232b74