Merge "Ensure local debug symbols are generated first." am: ae3c5cc582 am: bac4d025ca
am: 111575f993

Change-Id: I6b8ae5a0dabe872367cbba767fbdf513d9aab78c