Merge d20cf0047b0204cf169b4b5db3e6b81742637af0 on remote branch

Change-Id: Ia21907181e933c45f9789ccc404584f41ddfdfbb