Merge changes from topic 'b/62584347' into oc-dr1-dev
am: 696cb63064

Change-Id: I12ac80c5a735edb870206db14f834ba6bcd09a6b