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

* commit 'a2edecfe75134ba8bb7258ef30941ef3e9024de4':
  Issue no : 3370622