(cherry picked from commit c276d5ba)

(cherry picked from commit c085f917)

Change-Id: I9e79c07aa3cbb70076d9bab07294062df4be02c6