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

Change-Id: Ic3a42d3b27edb5111bfd86ee11d562aebe322ca3