(This reverts internal commit: 82ca9c2e) Test: None. Change-Id: I48bbbe197c8e793bd9888b6ef4dadb2b3466423b (cherry picked from commit 852aca05)