Change-Id: Ib2754450cd7caa2675b872c8c9f3d41cec950770
(cherry picked from commit 5d06df27)
(cherry picked from commit 451527c8)