Merge 19966de2e35e8578e8c5bbb02e8795ba16c5b665 on remote branch

Change-Id: I23674d3969bac6030351009332c6cb2168552cd2