Merge 45848adcd83cfdaefedc0b24ae5f216b96ff90fc on remote branch

Change-Id: I3a71f661d6d7dc3771c71d9bf2e6ea8d6ae1e76d