合并修改 
Change-Id: I6dd1e5e9a585f1d26c48f54c1743d10812081625
Merge remote-tracking branch 'CreekLou/master'