Fixed a rebase gone wrong with pageindicator
am: 20e84c7

* commit '20e84c750f7ef783344f9890764906e20b0df822':
  Fixed a rebase gone wrong with pageindicator

Change-Id: I08bfc4b3c0cb3a8159645c7ff6d017daa8db6c9e