(cherry picked from commit e42611f8) Test: make Fix: 154627439 Change-Id: Ifee830595bb145aede4dad1d9e42a20e54b6be66 Merged-In: Ifee830595bb145aede4dad1d9e42a20e54b6be66