Merge "Fix build issue due to implicit addition of unneccessary Import-Package"