Merge changes from topic "explicit_shared_compile_reason_cherrypick"
am: 5e5fc34b42

Change-Id: I5af5a20cae531d5fc93faae00dfbe399f08da766