Merge changes from topic "b127336441" am: 9b07b1ab41
am: b7e98cd863

Change-Id: I97b48b8c50056e4ba69768f08c04758c4e1e8bbd