This reverts commit 252cb138. Reason for revert: testing merge Change-Id: Iaec56671820a950c551b3a97ceef2c9009518384