Merge 6655b769c3a4adbdb52704ebaf3c1f82d4aa5428 on remote branch

Change-Id: I31d3222bed15170c9dcac7e16a53461ca8b26ee7