Merge "slim: envsetup: extend hmm" into lp5.1