modify for new source

Change-Id: Ib8a3af59a789a8dbf7250ae84c2c184c964645a0