Bug: None Test: None Change-Id: I52739308ac6570aa6d0da4ef0cfbc3d0a7a804d8 (cherry picked from commit 0716659f)