Merge "Merge "Merge "Remove duplicated test" into nougat-cts-dev am: 3b9d56d2f2  -s ours" into nougat-mr1-cts-dev am: db4d66f7da"