Merge changes from topic "enable-unknown-warning-option" am: 1dbd332c81 am: 099f6321e1
am: 455a1938ab

Change-Id: Icedde0e12f6cf5c119315c29aa0979d4babb27a3