Merge "Update the file naming"
authorJulien <zhang.jun3g@zte.com.cn>
Wed, 21 Sep 2016 14:46:56 +0000 (14:46 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 21 Sep 2016 14:46:56 +0000 (14:46 +0000)

Trivial merge