Merge "Add missing copyright messages" am: 872f386f6b
am: 32a1dc5075

Change-Id: I9602e1c9dda5e842fd71c9f48cf354aea4650d74