Merge 3f842658c51e2b227cd798301b56458102c5d329 on remote branch

Change-Id: I696d5ad373cbb6e0ef915fb563f23690bdbf1e46