Snap for 4541105 from fb7d3730fae1e4ba0bf5e8054e1f0ddc74243b05 to nougat-mr1-cts-release

Change-Id: Ifbda4f1fc508eb6ddeff72ecced4e07c220e03f4