Merge "add A3 (2016), A5 (2016) and update J7 page"