Merge 07d491a722082a6b06934e17af6529863c1e1aa9 on remote branch

Change-Id: I6a45225b5fdce7570540b8ef634bb75ae55064d3