Change-Id: Idd521f724684986ff84306327d42b810f7b30245 (cherry picked from commit b9e6d98c6c0a05ebfc73a14d1ac2a47d58290241)