Change-Id: Iecb4ae8ca0769234ffd4d870ea63a324f67ac377 (cherry picked from commit 64642337e1d3738ae473d96e83a855013606b439)