Android S Preview 1
Merge cherrypicks of [13425554, 13426065, 13425555, 13426033, 13426035, 13426036] into sc-preview1-release

Change-Id: I8ca2794acee66bb4bd901f94784f27bff47a3a6a