Change-Id: I8e34ca8c30f308744022f17fac2444a496abd9e6 (cherry picked from commit 16ab0eca74751c331c1c74612548a27735a450b7)