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

Change-Id: I3343cbf4df38effbb8531b78abd5053628c93e88