Brings this fix inline with updates to master

Change-Id: Ia50c3ac043b4c927ca59cbbdc2bba42f73e550e4