This reverts commit 713c22ed. Reason for revert: Bug fix cl in same topic Change-Id: Id97f05c76551ecea98dccc3da4582a1c8fc7d6ea