add changes by billchen1977

Change-Id: Ic8f9fa498d29be4f9be1ffb567d22ef6159507e0