Android N Preview 2
Merge commit '13c48e13f9118cedefd36fcdef870daac68ad415' into HEAD