second change from Sept 15th

Change-Id: I58b7e9849673009f95f4fa4e888aab20fb9b5145