Change-Id: I3db016a15e877fb44c0023a6ce3f9c0a2b56d9a7 (cherry picked from commit f1787c34502fde5b1d141f61bc4e234f0ef8aa61)