Updating with TeamGummy manifest

Change-Id: I5feabdbcfa1ac4632549a46069f400e77a107599