Merge 3c0613d6ae6e6f1ec1c31fd321d78d58011d5f8a on remote branch

Change-Id: I0670485d26b0221f14b27bb9ca99f914b78b1d19