[automerger skipped] Merge "Fixed that unmetered-used-only flag not properly...

[automerger skipped] Merge "Fixed that unmetered-used-only flag not properly set" am: 003196a8 -s ours am: 04ef26d7 -s ours am: 3b6464cf -s ours am: a3cd9406 -s ours
am: 8ffefda2 -s ours
am skip reason: change_id Ib84f9116a8518e1257a187d63a5642144f19225e with SHA1 e148aade is in history

Change-Id: I6056dfddffd2ed70c79c29b4190bb3b2f1ac3dfe