Reflect upstream changes

Change-Id: I7cd12f59e66d6e9a2794629bf11358f138b53482
See: I22e100bb0f9566af6ddccd88bc310f8902c5ff70