Add support for max-target-s Bug: 169748350 Test: m Change-Id: Ifdd7b7a71e96fa6ba628acea0f9ad7996673c7bc