Merge 7d99934c96b272b15f28b59320dad026b4b8b9ab on remote branch

Change-Id: I1d80809016b3f736cad77bdf7a0cc2ffb12889c1