Merge e0910f097f9f18a994f28a5650deb5adfccadb02 on remote branch

Change-Id: Id356042d28ce30a7c1ca07bbbcbbb077142947d0