Merge 7f80192237dafa18d74d44a6a7ff6d3d80a2bf0b on remote branch

Change-Id: I49852ce68f8ed8659a70aeea5688090ab69e6db5