Merge "Update CTS for I78948446a63b428ae750464194558fd44a658493" into nougat-mr1-cts-dev
am: a17fcede71

Change-Id: Icd9efa7b22d27fd32a60e5d0f71dc04b005596c7