tree 79b8431518f3eef02b713dc63ac87668fd65a0a1
parent 245e3a300871f5d507423a937573f51ef1d64896
parent 7f8501adc89157032a62fb3e75ceb019fde65b9d
author android-build-team Robot <android-build-team-robot@google.com> 1508791243 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1508791243 +0000

Merge cherrypicks of [3113423] into oc-dr2-release

Change-Id: Ic35d31e379cfa18be3204adc73d3159eb06ba3dc