Merge bad65c136a48b1a405a76f9fcb9bf268de8c708e on remote branch

Change-Id: I7af103cdbaed6e99764d234f94a12ccc4c32d8de