[automerger skipped] Merge "Multiply the total memory by mem_unit" into...
[automerger skipped] Merge "Multiply the total memory by mem_unit" into rvc-dev am: b7bca21b -s ours am: d6a8813e -s ours
am skip reason: Change-Id If268b1ea63d7166158ac546dd8a1f445eb3d09f9 with SHA-1 fb18abde is in history
Change-Id: I37401fae9fe68bf779f1fa093652d679d1fbbdbb