Change-Id: I1101cb204ab583a204447d63e6a031a17179dfe7 (cherry picked from commit 8bffb053db418022c7cba5d67234412edd675862)