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

Change-Id: Ie3b37a5019960ae5a03dde7963fe3f8787371328