am 08902803: am a2edecfe: Merge "Issue no : 3370622" into honeycomb

* commit '08902803458faa74fd9aeaec2d9de35046912ed0':
  Issue no : 3370622