Code update

Change-Id: Ibd72a66323e8b424e148ce8156ec2a7d39aa7029
Signed-off-by: rinfa0108 <richard.infantado@gmail.com>