Merge "Fix appc deployment build failure"