Merge "Update Copyright to 2016 and cleanup"
tree: 7b0078efbcd6d7bb1626e65b52dcb2a72feb9ae3
  1. acts/