Merge 699b57bd542ddd07d49ce8562442d334e4ffaa3d on remote branch

Change-Id: I413ba04596d99997b546f189a07a9ee320c374dd