[automerger skipped] Merge "Fixed that unmetered-used-only flag not properly set"
am: 003196a8 -s ours
am skip reason: change_id Ib84f9116a8518e1257a187d63a5642144f19225e with SHA1 e148aade is in history
Change-Id: Ib64476ed4064c4bb30e0ed0017d5f4dc7770d392