Merge "Add owners to setting packages." am: f82cd59476
am: e6f052e928

Change-Id: Ie9bcc92888073e504ac444c42bc801c50aac7eb5