Merge "Report the right resource version in am get-config" into lmp-dev