Merge 6d9d482c12058e36a3ce6a720aa3f1562359b503 on remote branch

Change-Id: I559467bc572684771406590adba562dc5d82e5b2