add changes by billchen1977

Change-Id: Ic6b31880ddd220a4539eeaaf07ff9452d2ccce6b