Bug: 20207616 This reverts commit a771b9861d11671c780092d35c0062eeefcf37c0. Change-Id: Ifd891cc075274a7986e987229e0fed5a04ed9ff0
Bug: 20207616 This reverts commit a771b9861d11671c780092d35c0062eeefcf37c0. Change-Id: Ifd891cc075274a7986e987229e0fed5a04ed9ff0