Merge "Autofill sample: Merge master into oc-mr1-dev." into oc-mr1-dev am: f41ef25b am: 9071e886 am: 19928785 Change-Id: I6ea69c6aa2d411c9bbe08572cdf2c9fc9bf8ac2d