Merge "Add owners to setting packages." am: f82cd59476 am: e6f052e928
am: dc75d02b95  -s ours

Change-Id: I4c34683cdd13374e775d225b3acb3256107b922b