jira: [none] Change-Id: I30faee9227b3821aab2adbb79f7ad2b539f9f8b9 (cherry picked from commit bc3b5f738fd14ab8df87918bfc6aa31dfe8c4685)