DO NOT MERGE: Cherry-pick the following missing commits from nyc-mr1-dev prior to b/33090058, which was lost as a result of merge b70b7f8235ef38575467b6bb702be29e9d1024c7:
am: 8689fc01ee

Change-Id: I8a62fada35c0deae5b47c3c9726fa4dc687859b7