Merge e540b4aa568a01154817ced9bd0cd064dbbb554e on remote branch

Change-Id: I6a391ccb01a02b3ab7ad61cfe642401786f9c158