Change-Id: I7144897568de2b877bcb9742457920f9570a61d6 (cherry picked from commit d0f4c901ce17e7aa7712e9255acf559644df110a)