am "am 71518174: Merge "Fix project settings." into lmp-mr1-dev"

merged from goog/mirror-m-wireless-internal-release
4abf088 am 71518174: Merge "Fix project settings." into lmp-mr1-dev