Change-Id: Ie4b979e4cfdf99d822801400cd6b54773f526d7a (cherry picked from commit 2b8b32a2d2d8181d1ab0c490e1a7b4333dc34fad)