DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 89cdc0c1d8

Change-Id: I180670ed08710f325b9f83edfe152f10455d856c
tree: 8b2a55f45a55af90180dbebe014db11bfb45819c
  1. atom_field_options.proto
  2. atoms.proto