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

Change-Id: I4b4b8117db913ac797abb99b92ae5430193866e6