Merge "Remove VID asdcclient from manifest" into beijing