Merge changes from topic "explicit_shared_compile_reason_cherrypick" am: 5e5fc34b42
am: 64e4210099  -s ours

Change-Id: I53aa31310ebf9e1486ad7172e5fd75eb1509ff2d