Merge branch 'merge-modem-utilities-rewrite' into merge-modem-utilities

BUG=chromium:392610

Change-Id: Ie4c770633201910322a8d29e78aa549ca4628f91