Merge "Move add-printer list headers to the right positions." into nyc-dev
am: 00e3c23265

* commit '00e3c232656e648376c94a78b568c3ca1fe8c123':
  Move add-printer list headers to the right positions.

Change-Id: I43e2a7a548bbb21223f1007c03c57a00aa966402