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

Change-Id: I991d3e8d4f008e3e2bb8f93ec23b54f056f97f29