Merge 9e1b3262bb55a7cc2acc0b31621a95c03dcac6e2 on remote branch

Change-Id: I9a46d0b7fda1e97f57c30c63c2bad2fb7519731b