Merge "Change system-current.txt and module-lib-current.txt for changing API according to council feedbacks" into tm-dev