Merge changes from topic "defnormalz" am: 178ede377a
am: c210a8b6bc

Change-Id: I73f6b0775b57cb5ee217d851c586b445eafa54db