GitLab

automerger from choking on it.

p4 sync
p4 integrate -r -b android_to_tc3 //...@111620,111620
p4 resolve -a
p4 resolve     # resolve a couple merge travesties

PRESUBMIT=passed
BUG=1399648
TBR=edheyl
OCL=111902

Change-Id: I854b01553dd92bbf9c864f5a9bd51a3d665f0ac2
Signed-off-by: Glenn Kasten <gkasten@google.com>