Change-Id: I5143b609b881c6352cd22425165edf10c189c876
Merge pull request #3 from pzsun/change_0001

Change-Id: I5143b609b881c6352cd22425165edf10c189c876