Merge "Change commonRef to avoid using jweak"
am: aa69a6b77e

Change-Id: Ic3424bf5353b5becb27bc9c4d04aaf76d0ef2ad9