Merge "Autofill sample: Completed layout TODOs." into oc-dev am: 10e24fbe am: 72c16568 am: ce2ca605 am: e9aa5480 Change-Id: I70520a4e750696988b90f46727c1dde9db74762f