Merge 93b9d6b41e72aeb5d17b90583d61a3324c2f09c1 on remote branch

Change-Id: I731e36c2d1b3f5469e13d4887712294d71460f94