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

Change-Id: I59078073426760fd472a7be9662ea8f247483a6a