Brings this fix inline with updates to master

Change-Id: I815ccd01ea65be156a8d8ad0aa9272a95fa34c3b