Merge "Show version for APEXes" am: 02f874d564
am: 3a4aa90faa

Change-Id: I7130b6ae1e98411aa8e84dcc01e516528a9db861