Change-Id: Ic14f1285d234cd00895a343ae22aef90be415072 (cherry picked from commit 9bfb2ddb01878ffa983e9174cb46041fc8330aa8)