Change-Id: I9523e750fdb5fd76cf120ee2e64f3c63471c8132 (cherry picked from commit f053484c4a3310d93bbddfb4c8872cacebeb33c6)