Merge cherrypicks of [16017024] into sc-release. Change-Id: I225bcd067173d682a421e0c58538e723e153e419