Change-Id: Ie58f9031ac20f72f927a0bf525ef6de4130ac75c jira:None (cherry picked from commit b2f6382488926d678660f64dfa339ebdad046c2d)