Merge changes from topic "ownerz" am: 98cd65e17f
am: ac2b7439d9

Change-Id: Ic570b9085f6ffd7a3fd18603b95e2a8ba76a681f