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

Change-Id: Ib54b19cf9fdace9568408292fc7540e977eb3762