Merge "Merge src-N/ and src-pre-N/ and target API 24 (1/3)"