Initial import from upstream-master am: 18f09e4dd4 am: 332a30e181

Change-Id: I00f39ca24713a577b8bf9051738c11b6cd03129a