Merge changes from topic "enable-unknown-warning-option"
am: 1dbd332c81

Change-Id: I5af8e2c07d7b09493271543b18d62b88a550a8db