Merge tag 'v1.3' into master

This merges tag v1.3 from upstream-master and establishes history
between upstream-master and master

This better positions the code for automating
future pulls from the upstream repository.

Bug: 167721530
Test: builds
Change-Id: Ieb361bade32dd21ab7dadbb74b79d3ee3c13ec1a