Merge 6fa447bf0f1dbe441905488ea2d82a27bb637aca on remote branch

Change-Id: I8f66e159b2505752e1b1134f07892eb76f6483b9