Merge changes from topic "defnormalz"
am: 178ede377a

Change-Id: I3cf369ea789b45a76d30d65fa9e456b47ebc1d60