Merge d66580a260207391011514429eef81f13635f89b on remote branch

Change-Id: I754d681bab4e5e2fc878869d02753e9d8f14c535