am 3a5a9d18: Refactoring layout parsing code

* commit '3a5a9d18daacb878a3eb379fce540ee6c67063e6':
  Refactoring layout parsing code