Changes to bring the quincytmo online

Change-Id: Ie1675776b9f5400a653a8ded81ebdc176b050330