Change-Id: Ie35dd2b5ab01b228d9906d9f094a644b5c81b48a (cherry picked from commit 266b8392098828c979243380636d8a84403206b1)