Merge 78f281caa32a5bcf5c3f8aec932c5d016a37438c on remote branch

Change-Id: I5778b404797d8d79670f1377c32bfb3eb5f78983