Android 6.0.1 release 12
Merge "Retain fragment loaders" into mnc-dr-dev