Test: make Merged-In: I18fb0b79e348aba0848dbdd104ea9ab05c9ca169 Change-Id: I18fb0b79e348aba0848dbdd104ea9ab05c9ca169 (cherry picked from commit c71a043d)