(cherry picked from commit bfde4866)

(cherry picked from commit 3de922d4)

Change-Id: I5c56634b1bca8e37fa73d02d2428645301b6c547