Merge cc3a2077c74a483ebbdbeb84a6abae3991a357ec on remote branch

Change-Id: I5848d2416cb24a40c9ca34de98ca6f4cc8ed8118