Merge b9b43b1813b7d734f75bfaca791f9d06ba771114 on remote branch

Change-Id: I780be26ffe6d13e3318632687e26dc7cd25468a4