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

Change-Id: I2126bc739af9dffe7cacbf9567da065adc3a875b