Merge changes from topic "amlogic-g12a" into integration