Merge a26ece96b539d6f77847043ea4523a656c81ba45 on remote branch

Change-Id: I4b1b52252743cfe4523e8aea16bdbe2419daee03