tree f5851353c6b784caf2fd9ba80438343156a11517
parent e3168307bcd1c827c0d3ba15961aa1c9990cbe11
parent 215a16e46cab022e9a1525290fe99f12a99d5611
author android-build-team Robot <android-build-team-robot@google.com> 1521761752 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1521761752 +0000

Merge cherrypicks of [3783728, 3783729] into oc-m4-release

Change-Id: I9e1c316fea8f2bdf18fb8ad0bb38f5c4d6485fe7