Merge changes from topic 'b/64606807' into oc-dr1-dev am: 8193291ca3  -s ours
am: 706afb3221  -s ours

Change-Id: Ie3331beb2388cfb97574d3f61d93fe3a86f16e25