This update will obsolete two patches that were previously applied.

Change-Id: I521e939905e473ca5d440dea3b03faeb9af4c0fb