Merge 3f65df7ef91c78d677be4cedd6fd14a22cb9ef78 on remote branch

Change-Id: I1a8fc329e71131b250ae84436ff419886c2913e9