Update current file content to keep consistency with upstream file. Change-Id: Ic269113b135db0739be72fa6857eae7c37f0159b