Change-Id: Idf2a81cdb8e3e0d137143e37e7653c5be195391e (cherry picked from commit c6237d49) (cherry picked from commit 8804d917)