ebe78279baadd4e97e625e6cc52e8b52735f51a3
1445a428: Fix for b/4198399. This reverts the change for 4194032.
* commit '1445a4288de385346d666c6c33b7cfa3c92cf4ce': Fix for b/4198399. This reverts the change for 4194032.
Description
No description provided