am 9c3d03e6: Merge "resolve merge conflicts of f9ffa90 to lollipop-mr1-cts-dev." into lollipop-mr1-cts-dev

* commit '9c3d03e63ae15b1371138c62df47a530cb002140':
  Removing launcher tests from knownfailures