Android N MR2 Preview 2
Merge changes Ifc818a69,I433b33d0 am: be20684665 am: 576f858aaa
am: e17dd6e292

Change-Id: I138d1f62987b5c2e3328e5ffa101feb592768cea