Change-Id: Iae320face8b95492fa9082c0e5a6fc66da57dc62 (cherry picked from commit f7ec4df15529e7c929008b3a1f6ac4fd1276c985)