Reorder features for tracking purpose

Change-Id: I74e7c0ba61d97e8e769fea7a2cce576360a74cc3
Signed-off-by: George Zhao <george.y.zhao@huawei.com>
Merge "Reorder features for tracking purpose"