Change-Id: I004bfdbbac9b0897931fa206bff865bdb600ebf6 (cherry picked from commit 0b986af895ac42e4ad46919cd6c59fcfce443cdb)