Merge tag 'android-6.0.1_r13' into HEAD

Android 6.0.1 release 13
Ticket: CYNGNOS-1522