Merge "Add missing copyright info to RS default implementation." am: 5bc3be2ae1
am: d83d000f7c

Change-Id: Ibb4de9d32d1710a520281e38300e8539fab88972