ported commit of e98c1500f49d6aa70f9c91aff3a4cd3321bb00ff, cba460f8ac20bb4ff202c91fae026592849563d0

Change-Id: I4af5c1331b0751a0c7b521e8ecb53d616ace23c7