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

Change-Id: Ia1b92d79e68c93616321512f00da671c912df1a3