Merge 49b3529b25b05f25bb013be9e13dfe5bcc4dde5c on remote branch

Change-Id: Ib1276c4f1dd5c676840038e95f677a82e3414bfd