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

Change-Id: I8a060ba938a1b32b7e3da88e775a6b0ec1cfd67a